Consolidate 8.0 compatibility, update doc