DIAP-243

Part of DIAP-243