Merge branch 'master' into feature-dev

Modifs by @TheBlackWolf