Merge From Official Disco 

Hey Tait. I merged the update from official disco repo, which aims to fix the GC issue.
Thanks.