Merge branch feature/test_tool_45635491

Sprint story: None
Main story: None