Merge pull request #12004 from samuelsov/dev/core#30#2