Offset for the token source location
auto-merge staging into master