Closes #1646, #1647, #1649