VALG 42 - Updates due to new views.
Merge branch 'VALG-42' into develop