Merge "Fix 616-cha assumptions."