Merge "Add a new field is_multi into Satellite atoms" into main