Merge "Update doc/tools"