v10.7 for merge