Comments also sanitized
Merge branch 'hotfix-2.3.25'