(cherry picked from commit 2fd40fa1a7af1f3c1a90ef9a5b13e162d426b976)
(cherry picked from commit dcd01b0295f926794ef953a1bfcddb27c95e7e67)