Keep simplifying redundancy implementaion for Controller/DebugController.
Merge branch 'hotfix/2.1.6'