Updated Changes file
Merge branch 'dev' into ms