DIAP-237

Part of DIAP-237