- Attempt to integrate changes from official lib