Catch another transform reparentage for previous commit.
Merge remote-tracking branch 'origin/master' into feature