Merge pull request #7045 from saurabh6790/root_type_fix_and_other

[fix] Root type fix