Merge "Improve large object free CHECK"