re-add cls compliance

fixes
Merge branch 'hotfix-4.6.1'