Include actions from player setttings
Merge branch 'master' into eve