Merge "Change streaming policy implementations" into sc-dev