DIAP-380

Part of DIAP-380