Synchronized with the source at edd16e763faa8bd2cdf7a4ddaaed6aa9bd7766ae.