Merge "BUG-2243 Fixing invalid hello message handling"