Updates to latest rl2 (2.0.0b7)
Fixes merge conflicts