Merge "master" into xs5.7.