Merge "Fixes to RedisBagOStuff"