Merge pull request #6783 from rohitwaghchaure/v7_1_issue

Hotfix issues