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