DIAP-174

Part of DIAP-174