Merge branch 'hotfix/TV_optimized_dashboard_not_shown_as_default_#6' into develop
Merge branch 'master' into release/1.0.2.0
Merge branch 'release/1.0.2.0'