DIAP-171

Part of DIAP-171