Merge 8.x-6.x into 7.x

Merge request reports

Loading