(cherry picked from commit c6b543e0729bc20f15e37d074fbf31d8c76c187a)
Closes #7849 (cherry picked from commit 6bdeafcf8c78e145595f52e885356be1210abe91)