Merge "Prevent empty non-Indexable keys from being added" into oc-dev