Merge "Fix redefinition related use-after-free bug"