updated controller
Merge branch 'origin/2.3.1'