Upstream lib-4774 updates.