Merge branch 'hotfix/StefanoHotfix'
Merge branch 'release/RodgeRelease1.0'
RodgeFeatureOne hot fix committed
Merge branch 'hotfix/RodgeHotfix' into development