Merge pull request #18679 from seamuslee001/vardump_d9_compatability