Manually merged 678223b9ae0cc2299f2251c9a3029ed6cf8e441e from master
Manually merged 0471dfe74a9f61e2fc2c03a963d71ba2bb68adc3 from master
Manually merged a8cbbe3ea46850ad53c25a8e75194c5c1ecbb029 from master
Manually merged 5af7ffa2fd90fc8910504505a1427784205348b1 from master
Manually merged 4ed9d84d4c06b5a7d8c9f6673134057bff74105e from master
Manually merged a05b9884a5fc567f69543bec533a85741d96abc0 from master
Draft of interaction with producers and scene_producer