Message and skill fixes
Double industry fix
Merge master into develop
After merge commit