PullRequest for #2417