DIAP-533

Part of DIAP-533