Merge pull request #6956 from MrPetovan/task/sanitize-path-item