Merge "Improper EINTR handling logic"