closes #3104
closes #3104 again
closes #3118