Use Display class for generic action
Merge branch 'master' into Users