Merge "Tune heuristics a bit."
am: e35764f1f8

* commit 'e35764f1f8e8b9b8ad1365967783532182fc61f5':
  Tune heuristics a bit.