Merge "Added RedisBagOStuff FIXME comments"