BE more assertive.
Merge bug26341
stable to default