(cherry picked from commit 9de8b97ed8c442cea73e38c542d902408f24d5dd)
(cherry picked from commit d1f134d9e2e3f88acf56c093d1797e08e410ce2e)