[HELIX-541] set upper_bound to R+1 to avoid live-lock, rb=27822