Keep simplifying redundancy implementaion for debug scope.
Merge branch 'hotfix/2.1.7'