Merge pull request #6799 from rmehta/minor-01-nov

Minor fixes