Merge "Adjusted interpolation and stretch intensity" into sc-dev