DIAP-276

Part of DIAP-276