Merge branches 'issue_175', 'financial' and 'music' into production