Comment for variation of type_id_changed? vs. updates.for?
Merge branch 'develop' into define_view