git cherry-pick ba42248575b9b8efff6ec6bf72dbd3cb70dbb60e
git cherry-pick 669b4c5f193f8e92a7741328942905714593705c
git cherry-pick 36f52ea6878b23bef4a3364b7e60519b05b736e6