DIAP-679

Part of DIAP-679