(cherry picked from commit e9ddd94992d83a7e552a3550819a68d5f3cc451a)
(cherry picked from commit 440847c19346aaeb1e67297320db0eb51217f916)