Merge master branch into xs5.7.