closes #2946