fixed "there is a problem with your connection problem" CDB-1402
Merge remote-tracking branch 'origin/CDB-1402' into release/2.8.0