Merged for 1.11.
33 files changed