Merge pull request #7084 from nabinhait/hotfix

Multiple minor fixes