Start upgrade to performance exploration branch so it's ready when that's merged.
More preparation for performance exploration.