Merge branches 'issue_111' and 'financial' into production