DIAP-196

Part of DIAP-196