Merge remote branch 'jean-sebastien/various-fixes' into next