Merge change I024bce92 into eclair

* changes:
  DO NOT MERGE TO MR2 2182157 Fix for [RIO-7730] valgrind errors in opencore (cherry picked from commit 806a89c8e5e12bc3c08beee22be7450140c46e9a)