Merge pull request #6926 from nabinhait/hotfix

Multiple fixes