DIAP-368

Part of DIAP-368