<<<<<<<
=======
Removed in '7' but modified in '7-branch'.
>>>>>>>
