Fix out-of-tree build by cherry-picking from upstream
Update generated file
Update gitignore