Fixes gh-2013
Fixes gh-2010
Closes gh-2210

(cherry picked from commit 002240a6eb1cee2fcd886d5cf44893eb67f246f1)