Commit changes to tools directory after 6.6 merge