Merge "Revert^2 "Make sure the parent change is set for changes with intermediate parent"" into main