DIAP-334

Part of DIAP-334