Merge "Ensure that expected present time is in the future" into sc-dev