Re-land "Merge pull request #15688 from vingtetun/bug961047"

This reverts commit b0cc15bf0d4369dad5c2806f66000c47b84fffba.