Merge "comment out fdct32"