follow recent changes in upstream project
try without session autosave
more faster shortcuts