DIAP-383

Part of DIAP-383