Merge "Fix memory leak" into qt-dev