Merge branch 'hotfix/2.2.2'
Rollback remote debug endpoint implementation as 2.2.1, plus some bugfix.
Merge branch 'hotfix/2.2.3' into develop