(cherry picked from commit fdf042dfffa4d2474e3cac86cfb8fe9ee4648beb) (cherry picked from commit 411836b74c6c02c0b5aebbbce29c209d93db1de2)