Used updates.for? over type_id_changed?
Merge branch 'develop' into define_view