(cherry picked from commit 77f2b83c49621bcb8613986a4ef83ace9407aa93)
(cherry picked from commit a0309c819b992553f034d28e4df3e6557771c67b)