[IMP] Fix security

Merged Jose Luis Zanotti requested to merge Fixes into 12.0-stage

Merge request reports