Merge pull request #9077 from andreasgal/v1-train

Bug 858435 - getOffset cost between 4-6ms most of the time and sometimes...