Merge "Add Config-at-end directive/support to Transitions" into main