Uplift changes for Bug 925398 (includes Bug 945284, Bug 947001)
Merge pull request #14717 from malini/v1.3

Uplift changes for Bug 925398 (includes Bug 945284, Bug 947001)