Backports to 0.8 release from 9.9->9.10 release timeframe