Cherry-picking fix 2