Windows: CLI Improvement (TP3) Upstream-commit: 33358f80e592686bb1872d9d50a4dd1e0391487f Component: engine