Merge branch 'stable' into release/2.0.0