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

* commit '3c084241448870866f42e1f7118710c511842028':
  Fix name-suffix rotation crash, for real this time