#9254: avoid break compatibility with the 2.0 api