Merge "Fix access to freed memory"