Merge in changes from base fork