DIAP-283

Part of DIAP-283