Merge of missing changes for 2.066.1.

Merge up to 0588458.