DIAP-675

Part of DIAP-675