8.0 fix retention concept

Merged Reviewer Intergaláctico requested to merge 8.0-FIX_RetentionConcept into 8.0-stage

Merge request reports