Merge branch 'master' into 1852_billing_period_calc