Update from stable branch.
10 files changed