DIAP-666

Part of DIAP-666