Bug 911322
Merge pull request #1399 from lnader/bugs

[TO_STAGE] Bug 911322