Merge "Fix a 'memory leak'"