adjust migration for the swappable model
Merge remote-tracking branch 'remotes/origin/swappableimage' into tng_dev