Merge portions of changesets 72278, 72306, 72309, 72521 missed by prior merge due to SVN snafu. Authorized by Daniel (1st 3), Eric (last 1).