Merge "Fix request id log messages"