BZ 869196

[merge]