STREAMS-44 | Updated provider to handle a minor amount of lag in the Sysomos System.
Auto-merge | Integrating changes from apache/master