For code review 20141014-2.