works with base 4.7.x as well