Merge master in branch 2.1