Bring in latest changes from Dan-in-CA