Merge pull request #120890 from KoBeWi/rule_out_3d