update for 64 bit ids
merge
merge fix