#4006: Remove redundant/duplicate variables
Merge branch '4006-remove-unused-variables'

* 4006-remove-unused-variables:
  #4006: Remove redundant/duplicate variables