DIAP-539

Part of DIAP-539