Merge "Maintain relative order of changes during CHANGE transits" into 24D1-dev