cherry picked @jgrandguillaume's porting notes
Merge pull request #5 from gurneyalex/8.0

cherry picked @jgrandguillaume's porting notes