Merge pull request #15323 from elisseck/dev/core/1266