closes #4152
closes #4147