Merge "Exposes way to bypass user action on update" into sc-dev