DIAP-374

Part of DIAP-374