DIAP-178

Part of DIAP-178