[fix] 8.0-stage changes

Merged Juan Ignacio Lanosa requested to merge 11.0-fx into 11.0-argensun

Merge request reports