* added fixes from the trunk for 85454 and 83128