Merge "Ignore continue transition if not collecting" into main