This closes #2937