Merge branch 'master' into amakeev/run_environment