merge from initial_description_fix/server_description_wait/server_logo_incorrect/connect_modal_nre_fix_2 (..to be continued)