fix: re-enable optional old casting behavior in merge

fix: re-enable optional old casting behavior in merge #5088