Merge branch 'setsockopt_incoming_cpu'