Retry once after fail in ModbusCore and always return the result code
Fixing small merge issue