Upgrade laplongejr's branch with latest master updates

LaplongeJuniorrequested to merge
master into laplongejr-experimental

Adding the few missed master commits to ensure archive works as intended

Rapports de requête de fusion