merge 54833 54840