Merged from HEAD
21 files changed