DIAP-685

Part of DIAP-685