Fix issue with spawnlists not regenerating under all conditions
Merge branch 'dev'