DataStore as a public component
Merge remote branch 'upstream/development' into europnet