resync of changes from a cleaner version of the HPN patches