Merge branch 'hv/coding-guidelines' into maint-1.7.11