Update gumby for the new tracker

Do not merge yet