Add the patch from the upstream pull request PR: 237388 Reported by: Martin Birgmeier <d8zNeCFG@aon.at>