Merge pull request #4205 from nabinhait/expenses_included_in_valuation

Expenses Included in Valuation