Now works both for 2.9.x and 2.10