Merge branch 'financial' into production