Fix wrong controller config mapping
Merge origin/master
Merge origin/master