Merge "Changes to the trigger segment" into main