Merge pull request #1113 from jbonofre/R7

Update compendium to 7.0.0