F2931022

F2931022: D25417.1737690609.diff