Merge "fixed an issue with 8x8 token cost in trellisquant" into experimental