Patch Set 3: Looks good to me, but someone else must approve; IP review completed

This now looks good to me.  I rebased onto master and cleaned up a couple of minor compile errors caused by other parallel changes, but haven't had a chance to run the unit tests over again to verify we don't have a regression.