Merging  Dushistov commits for fixing tests passing