DIAP-341

Part of DIAP-341