authorize controller
Merge branch '0.11'