merge 76661 76662
thanks