DIAP-299

Part of DIAP-299