remake Salavats changes in pull request 1056

rebase pull request 1056