DIAP-626

Part of DIAP-626