Other change in branch 2.