Merge pull request #6219 from MrPetovan/task/remove-x