[1.7.x] Fixed #22783: Make sure swappable models come first in creation