[MOD] Generic Modifications

Merged Santiago Said requested to merge MR into 12.0-stage

Merge request reports