closes #4499
closes #4477 and #4478