Merge "Add support for table offset"