Merge "Handle EAS versions better"