[TIMOB-15739]Removing breaking changes from Anvil
Merge pull request #5472 from srahim/timob-15739-FixBrokenTests

[TIMOB-15739] Removing breaking changes from Anvil