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