Backport Commit e29c637 to 2.3.x branch