Merge pull request #15293 from ixiam/dev#issue-826