merge followup: update ExpandI64