Few minor tweaks
Merge branch 'hotfix-2.1.33'