same in interpolator + some more
Merge branch 'master' into stabilize
syntax error