am 17bf5e3c: DO NOT MERGE

* commit '17bf5e3ccfe961e6cc967327ab092cfbd6568ddd':
  DO NOT MERGE