Merge "Check if stream exists on volume changed." into oc-dr1-dev