DIAP-234

Part of DIAP-234