86a04198d9
Fix #7667 (cherry picked from commit 43a2599801be348dfd41d928c7a66a590dbe8745)
Fix #7667 (cherry picked from commit 43a2599801be348dfd41d928c7a66a590dbe8745)