Merge changes from topic "am-8825d1eb8a35415d943128134dc14cd7"

* changes:
  Merge "[automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c7 -s ours" am: 3c9fa4f5 -s ours am: 6bbceace -s ours am: 70120486 -s ours am: 420a14fd -s ours
  [automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c7 -s ours am: b9b0d899 -s ours am: 586a4cb0 -s ours am: 21e4a912 -s ours am: fcb49e9e -s ours