Merge origin/newframework and fix conflicts