DIAP-362

Part of DIAP-362