TOOLS-292 enhanced metadata client tools