BZ904081 [merge]