*8995* Adapt to master branch