cherry-pick update to 1.6.0.45 from master