Incorporate changes from #2786
9 files changed