Merge branch 'master' into fix/composer_network_dependencies

7 jobs for fix/composer_network_dependencies in 48 seconds (queued for 1 second)