Make sure transformation happens with non-interactive
Merge remote-tracking branch 'origin/master'