DIAP-676

Part of DIAP-676