DIAP-682

Part of DIAP-682