DIAP-623

Part of DIAP-623