Merge pull request #16591 from ixiam/dev/core#1575