Merge "Fix weak global reference overflow"