(cherry picked from commit aa3cab1eb29c56368d15882d7260a994e615e8d8) (cherry picked from commit ce10e98826884245e733431297d0275177965f17)