I imported the prefix changes into the tree. The rest of the CAT seems to be very specific to prefix so I left that.
added, thanks much!
*** Bug 387899 has been marked as a duplicate of this bug. ***