DIAP-347

Part of DIAP-347