Merge pull request #3346 from nabinhait/develop

multiple minor fixes