fixing the bug
fixing tests
Merge branch '73775622' into rc