merge again, revisions 8516 to 8525