Merge "Use currentTimeMillis instead of epoch seconds" into sc-dev