(cherry picked from commit cd2ce34f10007efacd8631d3ce3ac4f4a6212966) Closes #2134 Closes #3163
Closes #2195