Merge branch 'feature/862'

Close #862
Ready for 2.2.0rc3

- What you did
Merge branch 'releases/2.2.0rc3' into develop