Merge branch 'hotfix/2.2.1'
remove debugging code
Merge branch 'hotfix/2.2.2' into develop