DIAP-198

Part of DIAP-198