Backport tests from 43f5250
Merge pull request #15292 from zzak/backport_43f525031ad3f83a04f84e79bbe1de340bf937aa

Backport 43f5250