Update from stable branch.