Update (closes #4332, closes #4344)