Merge "Fix unreleased stream resources"