community submission. Closes #1889. Closes #1596