Bug 917990 - Multiple fixes.
Merge pull request #1560 from rmillner/US3143

Bug 917990 - Multiple fixes.