Better fast turn
Merge remote-tracking branch 'upstream/master' into farmesh4
WIP