Merge changes for Kirill Solovyevk