Merged relevant changes from release branch to master branch