Fix offset for v1 API.
Merge branch 'master' into prod