(cherry picked from commit a6f2db9139c4a6b01d162ccf8884fc02c874b4cf) Closes #2647 Closes #2658
Closes #2195