fixing tests
Merge branch '75012888' into rc