Merge pull request #10491 from Minty-Meeo/dolphin-tool-more-stuff More dolphin-tool features and options
