Merge redistemplate/master