pr1040
Merge branch 'master' of https://github.com/furushchev/local_pr2_demo
merge conflicted