Trimmed some vertical space
Merge branch 'hotfix/11.0.1'