Merge "Revert "Allow empty IOmxStore implementation""