Merge branches 'issue_106', 'issue_107' and 'financial' into production