DIAP-622

Part of DIAP-622