Merge "Ensure transfer starting window transaction occur in order." into main