Incorporate @nigelgbanks 7.x additions here.