update changelog
Merge branch 'dev' into datasource