Merge from master-refactoring-1 branch to master branch