closes #4233, #4244, #4238