Closes #1395, closes #1404