Manual merge of change I3665f82b into master.
8 files changed