Rebasing again.
Merge branch 'ElemWise-squashed' into ElemWise