Merge pull request #13158 from elisseck/dev/core/544