*8826* Moved tool to master