Merge pull request #13073 from omarabuhussein/dev/core#513