case 2187 - Related views.
Merge branch 'case-2187' into develop