style enhancement
Merge pull request #1537 from grandoc/3.5

style enhancement
Merge remote-tracking branch 'origin/3.5' into 3.5_backported