Cherry-picking compat patches from master