Merge branch 'hotfix/2.0.6'
Merge branch 'release/2.1.0'
Keep simplifying redundancy implementaion for Controller/DebugController.
Improve test coverage.
Merge branch 'hotfix/2.1.1' into develop