Tweak controller, joint and view api ref.
Merge branch 'origin/master'