Pulling in changes from original upstream. Keeping their changes to avoid conflicts