Bug 926367: Made requested changes for pull request