am 147a6767: am 9763de61: Merge "Old habits die hard." into lmp-dev

* commit '147a67677163a24bf1df6e207f466bcaab960081':
  Old habits die hard.