Merge "Keep source ID into native object" into sc-dev