CORE-4073: Ongoing changes