Improve diameter calculation
Merge branch 'master' into feature/fix_investment_diameter
Merge branch 'feature/fix_investment_diameter'