DIAP-167

Part of DIAP-167