Merge changes I2d4d3109,Idecec5bc

* changes:
  test(fuzzing): adding variable coverage
  fix(fuzzing): resolve fuzz build issue