Merge pull request #14086 from rohitwaghchaure/multiple_fixes

Multiple fixes