Merge "Fixed issue with invalid stretch params" into sc-dev