Update to work with branch for stable 3-3-0