a few merges from @FlorianDeconinck thx :)