DIAP-358

Part of DIAP-358