Merge latest upstream changes using Github