2.2.0 readiness
Merge branch 'releases/2.2.0'

2.2.0 readiness