Merge pull request #20270 from demeritcowboy/relative