Update changelog with latest change
Merge branch 'Dev'