DIAP-576

Part of DIAP-576