Final changes to the comp guide for v4
Merge pull request #5616 from nhr/v4_final_comp_guide_changes

Final changes to the comp guide for v4