Merge "Doc change: Tools section of the dev guide restructuring"