DIAP-371

Part of DIAP-371