New branch from last know working point.
Conflicts resolved
Merge branch 'master' into production