Last commit before the presentation

(no hotfixes)