I tried to make a unit test and a possible fix for #33968
Someone who knows more about it than me should take another look at the fix ;)
Comment From: pivotal-cla
@rPraml Please sign the Contributor License Agreement!
Click here to manually synchronize the status of this Pull Request.
See the FAQ for frequently asked questions.
Comment From: pivotal-cla
@rPraml Thank you for signing the Contributor License Agreement!