Resolve "Address memory leak on error"

Merged Mark Andrews requested to merge 609-address-memory-leak-on-error-v9_12 into v9_12

Merge request reports