(cherry picked from commit 7e3c96c8) (cherry picked from commit 93034acb) (cherry picked from commit 9bcf40cb)