Support selecting redis database
Merge from master