Merge branch 'develop' into lbudginas/#471_add_default_view_for_empty_activeTab_param