Resolve "Address memory leak on error"

Merged Mark Andrews requested to merge 610-address-memory-leak-on-error-v9_11 into v9_11

Merge request reports