Merge branch 'gb/maint-gitweb-esc-param' into maint