Fix [34538ba43f]
Fix [34538ba43f]
plug memory leaks
merge trunk