am 93e5b8df: am 3c084241: Merge "Fix name-suffix rotation crash, for real this time" into lmp-dev

* commit '93e5b8df341c30c0206dbbfb981ef09728a8e3b4':
  Fix name-suffix rotation crash, for real this time