#6937 - removing tabs and fixing syntax error
Merge branch 'hotfix/#6937-syntax-and-cs-checks'