37ea7a7d52
Closes #8565
Closes #8536
(cherry picked from commit be5802e473)
Closes #8565
Closes #8536
(cherry picked from commit be5802e473)