The two patches gives wouxun code a better organisation (from my personal point of view). They should be free of any functional change. Everything is related to Feature #285 which will come shortly