(cherry picked from commit d3e8696bf91d9121591d85ec3c3df5bc9effd3f5)
(cherry picked from commit c570ea3ebc65148bc9ab3ecb8e4111ae5572fd57)