(cherry picked from commit 0a5ec494b574ccd3db3b234c7d6637d127bd16da) (cherry picked from commit 1e769bdd)