Development → master: a lot of improvements