Changes for branch 2-0-stable.