Merge branch 'hotfix/2.1.3'
Keep simplifying redundancy implementaion for debug scope.
Merge branch 'hotfix/2.1.4' into develop