Merge branches 'financial' and 'issue_140' into production