Merge remote-tracking branch 'etienne/fix-various' into main