DIAP-663

Part of DIAP-663