12.0 real

Merged Santiago Said requested to merge 12.0-real into 12.0

Merge request reports