Cherry-picked from rekcon 8941e3a74fa430c1bd8a738c22f9474a61d74d51
and tweaked poll timeout to something between incoming recommendations