Merge pull request #19664 from demeritcowboy/case-rel-minor-cleanup2