Merge "Fix handleStreamValidateAndCommit() (5/n)"