Merge pull request #18613 from mattwire/moveloadrelatedobjects