Optimized composer call
Merge branch 'master' into release