fix BZ904280

[merge]