Updatde from stable branch.
11 files changed