Bug fixes around PN re-registration
Merge pull request #689 from bhariharan/unstable

Bug fixes around PN re-registration