1.0.8 cherry picks