CORE-1848:
* Ongoing changes