Removed superfluous 'if true' from cadet view
Merge branch 'hotfix/cadet-view-fix'