DIAP-387

Part of DIAP-387