More integration changes
More integration and bug fixes