(cherry picked from commit c26ccf1adb3a72df3f68e1150b86b813c691203a) (cherry picked from commit 9d9087a67ad599e678948d5c1036e51cb8cf5e3a)