Merge branch 'master' into release/2.2.0.0-incubating