Merge "Deem a change as independent if reparented" into main