Merge 2.2.0 work into master