Merge "Fix siminfo table creation"