TRQ-2676 - Merge fix from UFL for mismatching protocol messages.