Merge pull request #20747 from seamuslee001/part_guard