Dev PR

I open the PR to enable discussion on the dev branch