DIAP-376

Part of DIAP-376