(cherry picked from commit c1ff1e7f84d797bcba1407e67af293264be5eb3c)
(cherry picked from commit 7f3a45da73fc327e843954804585091b4040b59f)