Also add a patch to fix a bounds check problem discovered during an exp-run for bug 276478. PR: 276478