refactorings
(cherry picked from commit 7a2aa15)
2.2.0 RC1
2.2.1 final changes