Merge "Move quickening info logic to its own table"