Fixed bug.
Fixed and cherry-picked...
Merged.