Pickup changes for Bug 517499
3 files changed