am 22b8787: Squashed commit of the following:

Merge commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425'

* commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425':
  Squashed commit of the following: