am 401bbb05: Merge change 2593 into donut

Merge commit '401bbb0597a9f6bc9d752437e81f3f0c9b457b86'

* commit '401bbb0597a9f6bc9d752437e81f3f0c9b457b86':
  Bug fixes and performance improvements