#556 test alignment with datastore plugins
Merge pull request #557 from joola/feature/#556

#556 test alignment with datastore plugins