hp merge changes -- too numerous to mention here; see ChangeLog and