Merge "Fix dispose and wrong statement in comment"