Merge "Fix a memory leak" into sc-dev