Add tests to cover this scenario Add changelog fragment Fixes #36156 (cherry picked from commit 723daf3e3a)
723daf3e3a