BZ906845 [merge]