Financial: 60,78,79,80,85,81
Merge branches 'financial' and 'issue_84' into production