Merge "Check non-indexable keys for raw data" into oc-dr1-dev