Bring inline with library changes