Merge branch 'feature/926-7'
re #926 - Fixed regression after moving logic to the view class
Merge branch 'feature/926-7'
Merge branch 'master' into staging