Commit based on following commits from master branch:
c7255099d7a06663df733beaeff4520ae7c77d86
4308323da50d235ef4ac87cd1a0444f6c4f7aba4
052a73e1007741d7b63347d3a81cceda7e4dbfb3
db4b639b8ff754d771dd1f5057873820fb792cd8