better head
Maybe helps with #782
fix #784
Merge remote-tracking branch 'origin/master' into 1.4.7