Composer JSON
Merge branch 'feature-composer' into develop