DIAP-366

Part of DIAP-366