Fix for update_from
Force invalidation
Merge remote-tracking branch 'upstream/master'