Do not use Redis on provision-save.
Merge branch 'refs/heads/master' into cluster