Changes some values.
Merge origin/develop into develop