closes #3104
closes #3104 again
closes #3118
Merge branch 'master' into new_ui
closes #3416, #3417