Comment From: rstoyanchev
@poutsma the issue that this fixes #24498 seems to have been fixed recently. Can you review this PR which fixes the same to see if it is a duplicate?
Comment From: poutsma
This seems to be a clone of #26393, including the exact same @author tags. Closing as well.