Merging latest master branch changes to the streaming branch