Merge branches 'issue_113', 'issue_114' and 'issue_115' into financial