Pull from base fork

Start of v0.7.1dev