Sync 2.1 with commits in the master branch