Preparation to Merge master with the pull request