Merged from HEAD
34 files changed