DIAP-293

Part of DIAP-293