Merge "Fix GetMappingFromOffset"