Upgraded Testing to Router Redirects
Merge branch 'master' into development/data-protocol

* master:
  Upgraded Testing to Router Redirects