STREAMS-150 | If an ID does not exist in the datum's metadata, then we'll use the datum's ID.
Auto-merge | Integrating changes from apache/master