Merge pull request #25824 from surajshetty3416/fix-variables-import