Merge remote-tracking branch 'remotes/origin/BUG-4443-Configuration_Hostname_is_reset_if_TV_server_is_not_reachable'
Merge remote-tracking branch 'remotes/upstream/master' into 1.4.0Fork_SEB_New_Master