Ocf64 rel17 to rel18

Pelayo Torresrequested to merge
OCF64-rel17-to-rel18 into staging

Merge request reports