DIAP-188

Part of DIAP-188