Merge "Use currentTimeMillis for updated timestamp" into sc-dev