Fixed tabs to spaces
Merge branch 'release/6.12.0'