Merge pull request #13170 from elisseck/dev/core/485