DIAP-647

Part of DIAP-647