Community submission. Closes #1808, closes #1600, closes #1581