Merge 25584, 25588.