merge fixes from r17666 to 8.09