Merge in latest changes to native integrations