Merge pull request #3463 from nabinhait/develop

multiple issues