Merge change 4809

* changes:
  Warn when one handler replaces another.