Import the missing changes from the origin master branch