Merge changes I9a231625,Idaf3a905 into sc-dev

* changes:
  Avoid creating a layer for linear stretch
  Add a stretchy benchmark