DIAP-372

Part of DIAP-372