Main development

Please integrate this branch in the main repository to prepare the transfer of the repository