"Closes #1573" and "Closes #1577"