[Issue 9219] Streamline tool API for 2.6