Merge pull request #3602 from nabinhait/develop

Change log