am f40f074c: Revert "Revert "Bug fixes and performance improvements""

Merge commit 'f40f074c43fcef627131d4b631251192761b4daa'

* commit 'f40f074c43fcef627131d4b631251192761b4daa':
  Revert "Revert "Bug fixes and performance improvements""