Merge master branch. 0.94.48.R01-SNAPSHOT