Merge miscellaneous changes from recent updates.