Convert role to data-hook
Merge branch 'master' into role-to-data-hook
2.0.1