Merge branch 'release/Framework2.0'
Merge branch 'develop'
Optimisation.
Merge branch 'hotfix/PBChargement' into develop