Merge "Optimizing: Prevent potential valgrind error." am: 5681b6638b
am: 2165deba3e

* commit '2165deba3e4ecd1e51e244e4977c13cee2f0e9d2':
  Optimizing: Prevent potential valgrind error.