Merging in Publisher 7 fixes from Pub 7 Team