Force resolving dependencies conflicts to latest ones
Merge branch 'master' into production