am 604a598e: DO NOT MERGE

* commit '604a598e1e01bda781600a45e0a971898a582666':
  DO NOT MERGE