BZ901546 [merge]