Merge back v2.0

Keeping the original repo up to date.