Continue PR #1959

Closes #1959 
Closes #1720