Merge "Fix integer overflows while intializing reference lists"