null-merge of backported changes.