Merge pull request #20214 from ixiam/dev#issue_2584