merge cherry picked fix