Merge "Fix ConcurrentModificationException getting emergency nums"