Merge "Use a sentinel when clearing JIT table entries." into oc-dev