merge ruling's change.

merge ruling's change.