DIAP-661

Part of DIAP-661