DIAP-298

Part of DIAP-298