Merge "Convert extensionTime to millis" into tm-dev