Full merge of units from the trunk. Revisions [51031], [51066], [51189], [52773], [53125], [53293], and [53577]