am 7158b670: Fix StaleDataExceptions

* commit '7158b6705d330ac1e61d5aa51c51b54507c4ab88':
  Fix StaleDataExceptions