DIAP-189

Part of DIAP-189