Merge "Fix moving GC bugs in entrypoints"