Re-merged all files with official repo (to keep changed files to a minimum)