Converting times from seconds to milliseconds
Merge branch 'dev'