BADs 31 to 36 corrected at first (theoretically, without testing)
Merge remote-tracking branch 'origin/master'
Various