Merge branch feature/new_test_45631439

Sprint story: None
Main story: None