DIAP-165

Part of DIAP-165