Settings upgrade
Version temp deleted
New lines fix
Merge branch 'feature/core-upgrade' into develop