Merge "Ignore transition if not collecting" into main