Merge branch 'stable' into mergeback/2.2.2