(cherry picked from commit 345c09ee6ce5a3c8893bef56c8334573fb0d9bf8)
(cherry picked from commit 2eb740765e76e7ea4e4559de5441e2c3e7c9993e)