Fix build. Update changes according to STUDIO-5745