DIAP-173

Part of DIAP-173