Merge pull request #15989 from deepeshgarg007/bug-fixes

Minor issue fixes