DIAP-377

Part of DIAP-377