Merge 0.34.11-r5 into master