closes #3575 and #3596