Sync upstream lib254 changes