Merge pull request #72451 from gmli-eu/patch-1