Resolve RRH-48 "12.0 "

Merged Jose Luis Zanotti requested to merge 12.0-RRH-48 into 12.0-stage

Update to remove some warnings

Merge request reports