Merge branch 'BZ16833' into 'master'