back-merge

from now on we're doing the development in the main, the "dev" branch.