Merge "(Partial update) Change resetting the updated flag" into devel/master