bz907788

[merge]