(cherry picked from commit 5db7c4906235dd1070b9706ca4971f1eb5d74139) (cherry picked from commit a453f38015fec454f63e9f5459b0330ac3bc7eb3)