DIAP-642

Part of DIAP-642