RodgeFeatureOne hot fix committed
Merge branch 'hotfix/RodgeHotfix'