Merge branch 'bz_18087' into 'master'