change controller class to controller id.
Merge composer/master
Merge composer/master