DIAP-677

Part of DIAP-677