I would also appreciate if you could synchronize your branch with trunk after you make those changes.

Otherwise I will have a bad time merging this patch since there will be a bunch of merge conflicts.