Fix build. Make changes related to STUDIO-5816