Merge branch 'feature-composer' into develop
Composer JSON