composer support
Merge v2.7