Synced with upstream and added files to gitignore