DIAP-169

Part of DIAP-169