0.17 cherry-picks