Bring more or less in line with v2.7 of parent

Merging in parent at this point is virtually impossible, too much has changed.