DIAP-348

Part of DIAP-348