Merge branches 'issue_32', 'issue_44' and 'issue_46' into production
issue_3: financial module