Merge "Fix memory leak" into devel/master