DIAP-186

Part of DIAP-186