Merge branch 'develop' into implement_composer

5 jobs for implement_composer in 5 minutes and 42 seconds (queued for 3 seconds)