Backported changes
12 files changed