Update from 2.0.A.2.254 codedrop

Mostly removing HUASHAN_CT ifdefs, adding debugging code