Merge "Add extra handling for loading intern tables"