Merge "Add index on rc_this_oldid"