DIAP-668

Part of DIAP-668