Closes #2547