Merge "Correcting 'id' type in compute schema"