Merge recent changes from bruce