Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11