Merge RC 2.1 into master branch