(cherry picked from commit 60b5683cddc2f8c026935528002c736f74018798)
(cherry picked from commit 678593583b598f3f06f2a838ce4cd788ed1de513)