Test fixes and readability
Cluster support for redirection
Merge remote-tracking branch 'origin/master'
Docs