merge 37486 37487