Original Pull Request #2637 Closes #2627 (cherry picked from commit d9bb9911f91f2da8723e579fb3962ecf13a5a651)