Merge from norimiso/rps-redis