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