Merge branches 'issue_174' and 'issue_176' into financial