Str::camel instead
Add buttons to defaults and add some accessors to allow logic injection
Merge branch 'refs/heads/2.3/develop' into 3.0/develop