(cherry picked from commit 10be45986cdf86a89055065b752959bd6369d54f) (cherry picked from commit e3baa0988b4dfb592afe426ffeba3c7091b271c5)