Improve GetTimestamp parsing Upstream-commit: da99009bbb1165d1ac5688b5c81d2f589d418341 Component: engine