Merge branch 'datastore_style' into development