Add description to display/view combinations
Merge branch 'ViewDescription' into develop