Merge round_robin feature branch.