Reflect the latest encoding-related code changes