Merge pull request #8786 from MrPetovan/task/composer