Merge branch '2.0.x-stable'