Merge "Fix GenArithOpInt to work with RA correctly"