Merge branch 'STABLE-BRANCH-2-2' into master