Committing 7.x stable branch.