Merge "Add offset when rescaling streams with different min indices" into main