Closes #1383
Closes #1356