Merge changes Ia5f7028f,I1d7dc74b

* changes:
  Merge commit '2957939' into merge_work
  Merge commit '0507524' into merge_work