re-integrate release branch 2.2

do not delete branch post-merge (yet).