(cherry picked from commit 1e17585259203f957decc747f8735537179dc73c) (cherry picked from commit 26b29d7fadd64dbd1f3584a652785989e70eb579)