* Merge r55430 from trunk.