Migrate to fenix-framework 2
Merge branch 'develop-2.0-ff2' into develop-2.0