Merge "Fix failure in CodeItemOverrun on target"