Merge pull request #3558 from nabinhait/develop

Change log