Fix controller request
Merge branch 'dev'