DIAP-233

Part of DIAP-233