Merge pull request #3289 from nabinhait/develop

Multiple fixes