Optimize merging - use CombinedRelocations
Fix #252 and remove binary optimization
Merge changes