DIAP-692

Part of DIAP-692