Pablo, I made my best attempts to commit all your patches as is, but i did take some liberties. Please see the comments on the tickets and let me know if there is anything that needs to be resolved.
Thanks for all your work and testing, Thank you Jiandong also. -Ben Dewey
