Merge "Remove requireAutoTime on upgrade" into sc-dev