DIAP-655

Part of DIAP-655