Merge into github vanilla project