Shut up unnecessary controller logging
Fixed incorrect documentation for registration call
Merge branch 'release-2.6.0' into unstable