Merge "Fix quickening logic"