master
Add feature flagged datastore rewrite, with support for option fallback lookups
it { should_not -> it { is_expected.not_to
Merge staging/great-backport to master