(cherry picked from commit ab5473007e91f011d003ff0ba5ab32fa0d56360c) (cherry picked from commit 404be595)