Merge branch 'v5.0' into foreign_currency_calc