Merge "Allow empty IOmxStore implementation"