Improve composer consistency
Merge pull request #2267 from mabl0/composer-consistency

Improve composer consistency