Merge branches 'issue_143' and 'issue_144' into production