[2.2] Merge 2.1 into master