Merge remote-tracking branch 'origin/pull_test/shamaton'
pull req test2.