Merged binary handling from v1.55