Resolve "CMOCKA conversions"

Merged Evan Hunt requested to merge 620-cmocka-conversions-v9_12 into v9_12

Merge request reports