CORE-4876: Ongoing