DIAP-678

Part of DIAP-678