Merge remote-tracking branch 'alexis/various-fixes'