67dad7b746
Fix references in master + update FR in sync with v8.0 of the agreement
Fix references in master + update FR in sync with v8.0 of the agreement