Merge branch 'BZ20643' into 'master'