Merge "Add additional support for FromAlternateBouncer transitions" into main