DIAP-616

Part of DIAP-616