Merge pull request #23831 from jonasjelonek/croc-9.6.15