Bring in latest changes from the main branch.