Closes #4261 Also includes changes that might help with #9043 (cherry picked from commit e458de5e9c845ac5a278aec397b7a0cdbd4f94ed)
Closes #4261 Also includes changes that might help with #9043 (cherry picked from commit e458de5e9c845ac5a278aec397b7a0cdbd4f94ed)