merge 27476 31740