Upgrade gem v2

I have local commits that take care of change from results => match but since that's not done in core yet, I left them out for now