Merge "Add 64bit large object support"